Changed storage type to unions
Merge branch 'master' of https://github.com/ThomasHerzog/gen_map