Merge pull request #6 from codeTom/dev

Dev
Merge pull request #7 from codeTom/dev

Obed bug fixed
Merge branch 'master' into dev