Todays work from all of us
Merge pull request #58 from mierze/master

Todays work from all of us