Merge pull request #2 from paperphp/master

Leftovers
Merge pull request #3 from paperphp/development

Merge pull request #2 from paperphp/master