Fixed issue #1
Fixed issue #2
Version updated
Merge pull request #4 from NBoychev/master

Fixed issues #1, #2