Merge pull request #447 from zyzniewski/master