Merge pull request #7 from jaythaceo/develop

Code complete ready for testing