fix rdoc
fix DEPRECATION WARNING
Merge branch 'travis-ci' into feature/people_edit
refactoring