Fixed issue #16
Merge pull request #17 from minia68/master

Fixed issue #16