updated and reorganized brian/kori's code
Merge remote-tracking branch 'upstream/master' into BrianBranch
-no changes