Added an commented out test to address issue #4

Added a bug fix for multiple substitutions