this commit resolves issue #16
this commit takes care of issue #12
working on issue #13