Made the Hej class nicer. Fixes #1