changes related to review comments Issues/22

Please merge with master if all OK #22