Merge pull request #37 from NicholasPiano/master

Merge pull request #36 from NicholasPiano/testing-phase-1
Merge pull request #38 from NicholasPiano/testing-phase-1

Merge pull request #37 from NicholasPiano/master