Merge pull request #148 from Ferada/small-fixes