temporary backup
refactory in progress
merge from biz
Merge branch 'refactor'
Merge pull request #54 from unidal/master

big code refactory