v0.43 protected

Wouter Beugeling

@wbeugeling

551bb274 · Merge develop to master · Nov 14, 2018

Fix some errors and add a new feature