manually merged with master
Merge branch 'psr0' of https://github.com/Floxim/floxim into psr0