Merge pull request #7 from gtallen1187/master

updating dev with direct master commits
fixing typo
Merge pull request #8 from gtallen1187/develop

Develop