Hibernate support
Merge origin/master