Partitial fix for #53
Merge pull request #72 from Lexance/master

Fix for #53
Merge branch 'origin/2.2'
Merge branch 'sonata/master'
Merge branch 'origin/master'