omw to making jihad work. new inputloop? before test
Merge origin/master
new inputloop