Fixes #312
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002