mac-r drank 55578 bottles of soda
Merge pull request #12 from mac-r/master

Some adjustments