added rotaF hacked
added test suite
Merge branch 'jonathan'