fixes #6
Merge branch 'master' into deploy
build 1009