Added changes for version 0.4