fixes concerning suggestions pull request #70

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>