lalalaliloujj:x
jj:x
Merge pull request #2 from Shahorplop/master

new test, with --no-ff this time