Merge pull request #1394 from kjpou1/master