Merge pull request #5 from nubs/master

PHP 5.6 and PSR-4