Merge pull request #1 from mjoosmigme/master

main change 1
Merge pull request #2 from mjoosmigme/master

main change 2