updated some code.. still have error
Merge branch 'master' of github.com:ekwan/mandor