changes according to review comments #111

Please review and merge with master if all OK #111