Merge pull request #440 from ejurgensen/master