Merge pull request #156 from stevenvanrossem/master