Merge pull request #1 from zazz/master

Oops, update composer.phar to be for Str not Input
Merge pull request #2 from zazz/1.0.x

1.0.x to master