complete code and add some log
Merge branch 'master' of https://github.com/kevinkong/Emmagee.git