Merge pull request #2 from Kloadut/master

Few improvements