v0.46 protected

Wouter Beugeling

@wbeugeling

eb5f462b · Merge develop to master · Mar 12, 2019

More configuration options; bug fixes