Merge pull request #1 from paperphp/development

Merge branch 'master' into development
Merge branch 'development'
Merge branch 'development'
Merge pull request #2 from paperphp/master

Leftovers