i First theoretically minimalistic working version
Merge branch 'master' into develop