Merge pull request #21 from southpawtech/remkonoteboom/4.3

Remkonoteboom/4.3
Merge pull request #28 from southpawtech/remkonoteboom/4.3

Remkonoteboom/4.3
Merge branch '4.3' into remkonoteboom/4.3