restruct code
Merge branch 'master' of github.com:mokujin90/madam