Merge pull request #1 from pholtz/master

Pull for JUnit
Merge pull request #4 from mcifelli/master

updating entity class