Merge branch 'ChadPrice-master' Closes #678