Fixes #5.
Fixes merge conflict.
Merge pull request #9 from himedlooff/master

Fixes #5.