#58: review comments addressed
#58: review comments addressed

dalifreire/takes,pecko/takes,hs3180/takes,pecko/takes,erimerturk/takes,simonjenga/takes,essobedo/takes,georgeyanev/takes,bdragan/takes,mstzn36/takes,Bertram25/takes,yegor256/takes,georgeyanev/takes,antonini/takes,RamIndani/takes,ikhvostenkov/takes,simonjenga/takes,ikhvostenkov/takes,xupyprmv/takes,mstzn36/takes,yegor256/takes,xupyprmv/takes,antonini/takes,dalifreire/takes,essobedo/takes,hs3180/takes,bdragan/takes,Bertram25/takes,erimerturk/takes,RamIndani/takes