Merge pull request #116 from wade1012/dev

Dev