refactoring
Merge pull request #14 from tzh/mini

refactoring