Merge pull request #188 from d4mian/minor-changes