V0.4

Made several changes.