Merge pull request #2 from Jeffail/branch1

Branch1
Merge branch 'master' of github.com:Jeffail/Test into branch2