Few improvements
Merge pull request #7 from huglester/master

Few tiny  improvements