Merge pull request #672 from zdzichu/master