Fix for not handling mixing of @ and $
Merge pull request #5 from fatso83/mixed-variables

$ and @ are interchangeable