General improvements
Merge pull request #1 from kbjorklid/251014

General improvements