fix issue #19 and #48
Merge pull request #53 from SwedishPensionsAgency/issue-19

fix issue #19 and #48