Updated to v0.2.4

Major refactor