Fixed Issue #3
Merge pull request #13 from xearim/master

Fixed issue #3. Good!