Updated from 0.1.1 to 1.0.3 from Alan Storm's github