Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/31c9f262-b563-41a7-9f4d-bff6a501d17a