Updating with new 0.1.0 changes