Resolving issue #14 and #18