Merge pull request #193 from alfrix/master