Merging 0.2.0 Release back into develop branch