Merge pull request #268 from aesedepece/master

Fixes #265 (manually merged)