[Issue #193] Redid my work after wrong merge into master

Issue #193