Fixes #11
Merger inn 1.1.2