some refactoring
Merge branch 'master' of github.com:fijimunkii/hintr
refactorage
Merge branch 'master' of github.com:fijimunkii/hintr