Merge pull request #23 from dclaganiere/master

Fixed issues in map saving merge
Merge remote-tracking branch 'upstream/master'