Fixed issue #25
Merge pull request #30 from lmagyar/master

Fixed issue #25