Merge Issue#30: Java Error when clicking the demo app's "Init a map" twice