Fixed trading again
Merge pull request #65 from Databean/fixTradingAgain

Fixed trading again
Merge branch 'master' into moreSoftConfig