Merge pull request #155 from Gelma/master