Solved issue #18 and addressed issue #17.