Merge pull request #45 from fhaeser/master

merge hibernate bugfix