PR for Issues #97 and #98

PR for Issues #97 and #98.

Feedback appreciated.