Merge pull request #182 from stefanvanwouw/master