remove not used class
Merge branch 'issue-11' into develop
always return integer
correct return data type
correct var type
Merge branch 'issue-19' into develop
add comment
Merge branch 'issue-20' into develop