Develop

Per your request I merged my changes into develop branch in preparation for 0.6.1