Added saving support. Disabled map data saving for now since it caused issues.
Merge remote-tracking branch 'upstream/master'

his merge is necessary,