Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/ef536dfc-3235-4c08-ae0f-3ca70a954c91