Updated for the v0.3.0
Updated to v0.4.0
Updated for v0.7.2