merge conflict
canobie not compiling
merge conflict
Merge pull request #994 from bdonald25/bd859

Fixing merge conflicts