refactor complete...
Merge pull request #31 from mpint/newb

refactor complete...