Updated for v0.7.1
Updated for v0.7.1