Merge pull request #6 from MichaelJosephMiller/master

Merge pull request #5 from MichaelJosephMiller/development
Merge pull request #7 from MichaelJosephMiller/development

Merge pull request #6 from MichaelJosephMiller/master