Merge pull request #2 from codeTom/dev

Merge pull request #1 from codeTom/master
Merge pull request #3 from codeTom/dev

Dev
formatting