Fixed issue 26
https://github.com/DellGDC/sherpa/issues/26

Completed Issue 13
https://github.com/DellGDC/sherpa/issues/13