rachel refactoring and some additional testing
Merge pull request #17 from cbyn/alex

Alex