Merged branch InfoDump #6

Normal merging didn't realy work So I commit all the changes manualy.