Revert "Revert "Updated for 0.6.0 release.""

This reverts commit d3a579c89f3006202d99aa73a5a3e4ffd4a606e9.