Fix #9
Merge pull request #14 from taavit/unstable

Fix #9
Merge remote-tracking branch 'origin/unstable' into unstable