bugfixes
Merge branch 'develop' of https://github.com/chrisshroba/sherrand into develop