Bug fixes and stuff
Merge branch 'master' of https://github.com/Ryan-Cooper/Trader
Merge pull request #20 from Ryan-Cooper/master

Bugs and stuff