Merge pull request #163 from stevenvanrossem/master