Merge pull request #6 from jamarin6/mycommits

Mycommits
Merge remote-tracking branch 'upstream/master' into mycommits