preOO commit
Merge branch 'master' of https://github.com/naxob/leuko
pre OO commit