Develop to master

Version 1 completed. All tests are passing and ready for sending it out.