Merging 0.6.0 Release into Master