Merge pull request #1 from MinerP/newBranch

Second commit
Merge branch 'master' into newBranch