Merge pull request #249 from steenpass/minor

Minor