update wiki
Merge pull request #5 from ShowJoy/master

update wiki