Merge pull request #69 from ucsflibtopfstedt/rb2.2

various fixes and improvements