Fixed issue #15
Merge pull request #82 from jomarmar/master

Fixed issue #15