Merged in bugfix/valgrind-catchup (pull request #73)

Bugfix/valgrind catchup

Approved-by: Richard Laager
Approved-by: Elliott Sales de Andrade