Finished Trader Roadmap items

Need some testing
Merge pull request #628 from tacef/master

Finished Trader Roadmap items