Merge pull request #139 from Ferada/small-fixes