Checking in changes prior to tagging of version 0.04.

Changelog diff is: