Update to v0.4 + add tag v0.4 - cleaner code base