Small fixes
Merge pull request #29 from madevr/master

Small fixes