Master from Krzysztof

From https://github.com/kkszysiu/pycharlockholmes