Version keys now also in locations used.
Merge branch 'master' of https://github.com/ippes/Hive2Hive.git