init
merge
Merge pull request #1 from lunny/master

init