I think I did this right.

I hope.
Merge pull request #682 from tommyvyo/patch-1

#255 M001150 first try