Merge pull request #8 from vania-pooh/master

Fixed not rethrown step failure exception
Fix PSR2 coding style
Merge pull request #10 from OndraM/psr2

Fix PSR2 coding style
Partially fixed issue with mime type