refactoring of the code
Merge branch 'master' of github.com:smiklosovic/arquillian-container-android