New comments and latest update
Merge danny into develop