fix #2
fix #2.1
Merge pull request #5 from timjoww/master

Merge pull request #4 from timjoww/fix
Merge pull request #6 from timjoww/fix

Fix