Updated with v0.1.1 changes.