Merge pull request #6 from Matt3o12/master

Fixed a bug which would expand string incorrectly under *NIX.