refactoring to account for the readme changes, adding more tests, one broken test!
Merge remote-tracking branch 'origin/master'