Add some comments
use list.remove instead of list.pop
Merge branch 'develop'