Really a hack, grrrr

I simply wanted to to bring latest Qi4j:develop stuff to my own fork...