Small fixeds
Merge pull request #25 from munissor/fixes

Small fixeds