refactor common
Merge pull request #9 from slon1024/common

refactor common