Merge pull request #154 from ucsflibtopfstedt/master

merged rb2.2.2 into master