v0.25 protected

Wouter Beugeling

@wbeugeling

a6c61b87 · Merge develop to master · Nov 23, 2017

Bulk calculation; various small updates and bug fixes