Fix issue #16.
Merge pull request #18 from krakenjs/merge

Fix issue #16.