Fixes for master rerun
Merge pull request #38 from mistercrunch/fixes

Fixes for master rerun