Merge pull request #388 from ZachCook/master