Added features discussed in pre-demo work
Merge pull request #198 from karma-exchange-org/pre-demo1

Added features discussed in pre-demo work