Merge pull request #55 from douggie/account-manager

tidy up of epl statments in BasicPortfolioService
amendments to get #54 fix working
Merge pull request #56 from jule64/master

amendments to get #54 fix working
Fix for broken Windows console

Allows inputs to be read on the Windows console

Closes-Bug: #57
Merge pull request #58 from jule64/master

Fix for broken Windows console
Merge remote-tracking branch 'upstream/master' into account-manager