my commits
Merge pull request #32 from im965/master

my commits