[WiP] Kjakub master

Testing Travis