init
Merge pull request #2 from monotomy/refactoring

init