Fixed rare bug on very first Startup
Merge branch 'master' of https://github.com/moobid/JARA