Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/9b906d09-6a41-419a-b0fb-2fa427457247