Changes to allow for angle error analysis
Merge remote-tracking branch 'elis/master'