control structure
fix
fix
Merge branch 'tmp'
Merge pull request #30 from twiniars/master

structure reorganization