Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/0492ea3b-22a8-47f7-9b2f-d0735f101393