Merge pull request #749 from asw101/release/v0.6.0