Merge pull request #1 from ryanrocket/main

fix blockage issues