Initial implementation of issue #167

-Untested
-Other source files have not been updated