merge codes
Merge pull request #3 from naijim/master

merge codes