Merge pull request #11 from wirtoo/develop

Develop
Merge branch 'master' of github.com:wirtoo/symfony