Updated to reflect v0.3 commit