refine
Merge pull request #2 from arbi/dev

refine