Working on #45
Add comment