Added MOAR METADATA
Updated indicators
Merge pull request #2 from ntoll/master

Foo