Upped to 0.4
Removed TODO