Fixed calloc error (wrong function usage)
- looking for this mistake took 5 hours of my life, just to find out that the arguments of calloc() meant something else than i thought
Merge remote-tracking branch 'origin/master'