Print full classname (inner class support) and fix enum output
Merge pull request #1803 from edenman/1.x

Print full classname (inner class support) and fix enum output