Bug-fixes and performance
Merge branch 'master' of https://github.com/rcqsnel/ADAPT