Merge pull request #46 from jryberg/master

Fixed issue #19