Fix #56 by removing ambiguity over method of variable replacement.
Merge pull request #57 from ddumontatibm/master

Fix #56 by removing ambiguity over method of variable replacement.