Merge pull request #198 from gdamjan/master