Minor adjustments for the PR
Merge pull request #1 from karllindmark/pr10-adjustments

Minor adjustments for the PR