Added version to Glance
Merge with master