Merge pull request #141 from ucsflibtopfstedt/master

bugfix