Merge pull request #205 from FelixGV/master