Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/46f1a5cb-f661-4efa-932a-9f3b20762eb7