Fixed issue #75 to allow JAR file map loading
Merge remote-tracking branch 'origin/development'