Version tags

Please integrate my version-tags branch. It is huge enhancement in functionality.