Fixed 0.015 to 0.15
Merge github.com:jpober/strawman