Loading stored map policy changed. Not tested
Merge pull request #79 from marro10/master

Loading stored map policy changed. Not tested