Merge pull request #1 from dpree/master.

had some trouble..
split parameters at ? and & also
updated version
Merge pull request #2 from dpree/master

updated some dependencies