Merge pull request #8 from jensitus/hiber

preliminary result
preliminary result number two