Merge pull request #170 from stevenvanrossem/master