Merge pull request #22 from realtebo/master

Small fixes
Merge pull request #4 from MishFdM/master

Merge pull request #22 from realtebo/master