Bug fixes
Merge pull request #7 from nt1m/master

Bug fixes