Bryan Wx Update

added adjusted
Merge branch 'master' of https://github.com/teamsocl/teamsocl