Fixed issue #307
Merge pull request #308 from hintjens/master

Fixed issue #307