Development changes
Merge pull request #14 from chrissnyder2337/chris-dev

Development changes