Fix for #182
Merge branch 'develop' of github.com:patricktalmadge/bootstrapper into develop
Fix for #183