Develop Merge Into Master

Release 0.2