Merging prior to v0.6 release