Merge pull request #22 from realtebo/master

Small fixes