More comments added
Merge branch 'origin/feature/danny'