Merge pull request #117 from Ferada/small-fixes