Merge pull request #30 from uhtu/master

findbugs fixes
Fix npe, add settings to maps
release 2.1