Ver 0.4
Revert f466b4d..07f445a

This rolls back to commit f466b4ddab774b3a7ea806858d1c80907d3f1109.
Ver 0.4