Merge pull request #821 from mirage/master

github.0.6.1