Fixes #133

Implemented changes suggested by  cmawhorter for issue #133; so far it WFM