added tag concept
Merge branch 'master' into wip-tags
not including MAC adresses when cloning