Final commit for issue #20. This commit closes #20