Merge pull request #402 from etosch/untested

Untested
Merge branch 'master' of github.com:etosch/SurveyMan into untested