bugfixes
Merge pull request #2 from sundmanbo/master

bugfixes