revert due to bad merge..
Merge branch 'master' of github.com:melkir/Odefor