Some little refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/saucelabs/ProblemTest.java