Changelog re #165
Failing test re #165
Refactor a bit of cli.py & implement #165, fixes #165