Merge pull request #4 from OskarStark/master

fixxed variable names for PSR-2