Merge pull request #104 from ucsflibtopfstedt/master

odds'n'ends