Merged master
Merged master
Merged master
Merge pull request #9 from fanhattan/fanhattan_master

Merged master