Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/29d51824-5907-44a3-b78e-4505f7a4ad9f