Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/0c037632-99fb-44c9-9371-15f6a1e6aad5

As they were automatically made, please review them before merging.

Thanks! :)