implemented @dbarowy fix for #400
Merge branch 'untested' of github.com:etosch/SurveyMan into untested