Updated changes from release 0.0.6.