Feature/regex vars 97

Fix for issue #97 for review @dirtyvagabond @aboytsov @egamble