use list comprehension
fixed bug
Merge branch 'develop'