Fixes #131
Merge pull request #136 from Apsu/issue131

Fixes #131
Fixes #129
Merge pull request #138 from Apsu/master

Fixes #129