Merge pull request #464 from gregoryyoung/master