rewrote conditions
Merge branch 'master' of github.com:MGM-KTH/malloc