Merge pull request #15 from OPEC-PML/dev

More changes!
Merge pull request #16 from OPEC-PML/dev

So more small changes. Just keeping it all in sync.
Fixed a bug where 2 indciators with the same ID cant be loaded
Merge pull request #4 from pmlrsg/dev

Dev