Fixed issue #18. In turn added a new option to use return or display val...

Fixed issu #18