v0.36 protected

Wouter Beugeling

@wbeugeling

468761e9 · Merge develop to master · Aug 24, 2018

Many bugfixes, improved performance, new features