upgrade 2.3
fix use statement and wrong class name
Merge pull request #60 from cordoval/master

upgrade 2.3