ForTrader Issue 118

ForTrader Issue 118