Merge pull request #2 from arcshark/master

Update2
fishUpdate
Merge pull request #4 from icePunyanuch/master

Update Fish