changes from automatic review
Merge pull request #22 from JMSBot/review-29d51824

Changes from Automatic Review