fix #91

missing return statement
#91 thanks to Jimmy liang
fix typo

fist=>first
Merge branch 'feature-fixSet' into develop