new version
Merge branch 'develop' of github.com:jeffknupp/sandman into develop