Merge pull request #330 from dantman/master