Fixed issue #33
Merge pull request #34 from hmobius/master

Fixed issue #33