changes from automatic review
Merge pull request #26 from JMSBot/review-2cad7380

Changes from Automatic Review