Merge pull request #18 from MikeRyan52/master

master
Merge pull request #19 from MikeRyan52/master

master
Merge pull request #20 from MikeRyan52/develop

Develop