Merge pull request #11 from adatoo/master

Merge Arif & Jianfeng Code
merge and fix conflicts