House cleaning

irrelevant…. blackbox magic stuff
Merge pull request #1 from wenluo92/dev

House cleaning