Updated for 0.9.x

Resolves #49