Merge pull request #429 from ZachCook/master