Merge pull request #135 from andytruett/master

Fix encoding issue #134 with backwards compatibility to ST2