Merge Issue18 into development #74

Closed robinsedlaczek closed 5 years ago