Merge pull request #353 from transcental/master