Merge pull request #52 from pmelchior/master

Update the stable branch for relaunch
Merge branch 'master' into stable
bugfix