#34 minor refactoring
#34 remove unused method
#34 minor refactoring
close #34: Merge branch 'develop'