wow ... never expected .class to be undefined
Merge pull request #104 from jimmymain/master

code cleanup and comments