code has been organise
Merge pull request #31 from winstonho/master

code has been organise