clarified comment
Merge branch 'dev'

cleaned code and clarified comments