this is what i did today
Merge pull request #28 from walter503/master

this is what i did today