merge original #32

Closed vandervecken closed 5 years ago