Implementation of suggested changes from issue #5 and #6

See issue #5 (closed) and #6 (closed).

@nektar - I think I've implemented almost all of your suggestions.

See comments in issue #6 (closed) for additional remarks.