Fixed issue #15 - make memcheck option added.
Merge branch 'issue-15' into develop