Merge pull request #165 from stevenvanrossem/master