Fix NPE + Add Extra infos
Update script with Jorg version
Merge pull request #2 from JulienNexonia/master

Fix NPE + Add Extra infos