Give the lib an OO style.
Merge branch 'dev'

* dev:
  Give the lib an OO style.