Merge pull request #5 from MichaelJosephMiller/development

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

Merge pull request #5 from MichaelJosephMiller/development