fixed issue #28, #29, #30 and #31
Merge pull request #32 from symfonyse/sensiolabs-fixes

fixed issue #28, #29, #30