OOP version started
Merge branch 'master' of https://github.com/yuviv/ODK