Bugfixes
Merge pull request #3 from halldorel/wip-halldor

Bugfixes