Again missing bits
Fixes for the Buiild and renoved hibernate
Merge pull request #5 from aoehmichen/londonHackathon

London hackathon