Merge pull request #3 from MichaelJosephMiller/development

Merge pull request #2 from MichaelJosephMiller/master
Merge pull request #4 from MichaelJosephMiller/master

Merge pull request #3 from MichaelJosephMiller/development