Fixes #10
Merger inn 1.1.1