Fixed conflict between master and v0.1.1