added some code to prevent nullpointerexception when someone clicks
abort or doesn´t enter a name and clicks ok
added commentary and did a little bit renaming but nothing awful
Merge remote-tracking branch 'origin/master'