Updates some comments
Merged in develop (pull request #15)

Updates some comments