#18 update to req. based on feedback

@bjelkeman feedback has been incorporated.
Additional issue added related to organisation identifiers and indicators/benchmarks