Merge pull request #57 from alexander-zimmermann/master

Last changes for using Github instead of Lauchpad