Merge pull request #123 from stevenvanrossem/master