changes as per review comments Issues/111

please review and merge with master if all OK #111