Implemented most requested changes for version 0.4.