Updated for version 1.6.0 release.