Merge pull request #18 from nubs/master

Switch to PSR-4.