Merge Develop into Master

There have been significant clean ups to the code base, as well as adding another mesh.