Merge pull request #1 from codeTom/master

Initial