Release 1.1 - Include @beltofte fixes in master

Include changes from PR #2 into master