Merge pull request #2 from dan-lyn/master

fix psr-2