This commit addresses issue #26 and issue #17"