fanhattan_master
Fixed some tests
Fixed more failing tests
All tests pass
Merge pull request #7 from fanhattan/fanhattan_master

fanhattan_master --Do not merge