Merge pull request #1 from Bluehats/master

update fork
add wosh
Merge pull request #2 from acrogenesis/master

add mosh