Merge pull request #2 from gregor42/master

This all went horribly wrong - but we will Try Again...
Merge pull request #3 from gregor42/hoof-and-mouf

Merge pull request #2 from gregor42/master - tyring to get rid of this mess