More robust parameter encoding
Merge pull request #5 from rawoke083/master

More robust parameter encoding