Add barrier
Merge branch 'dev' of https://github.com/LevStreet/StarCatcher.git into dev