Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/6bb2b569-a142-4e8f-bbc4-f4211b5ce7a6