Make changes to address Issue #17...

* Everything tests fine