a better fix
Merge pull request #7 from byronyi/master

Fix for #6 is not complete