Merge branch 'develop', remote-tracking branch 'origin' into develop
Update comments following Trishank's review of the #186 pull request.