master new version.
Merge branch 'new_feature' of https://github.com/cheneylew/testGit into new_feature