Merge pull request #7 from fanhattan/fanhattan_master

fanhattan_master --Do not merge
Merged master