Merge pull request #14 from yads/master

Fix for issue #13