Merge pull request #4 from yetty/master

Closes #1, #3 ane #5.
Final fixed for 0.3b1.