Merge pull request #3 from paul-christmann/master

Big merge