Add tag informations
Merge pull request #5 from galileo/feature-1

Add tag informations
Merge pull request #7 from galileo/develop

Align master to develop