Merge pull request #101 from milimetric/develop

Simple wikimetrics support
Add option for short labels