Fix teh psr0?
Merge branch 'release-0.1.1'