add some codes
Merge pull request #2 from makokaka/dev

add some codes