Merge pull request #96 from undp/final-scripts

Final scripts
fixed operating-unit-index bug