Added keywords
Removed useless comment
Merge branch 'develop'