Fixed issue #12
Merge pull request #14 from hintjens/master

Fixed issue #12