Merge pull request #1 from CodyJamesCasey/master

get latest updates