Merge pull request #1 from csexperion/master

Updated only on fork
Updated 4 again