Merge pull request #2 from gregor42/master

This all went horribly wrong - but we will Try Again...