der fixes and additions
update makefiles
Merge branch 'ccbrown/master' into develop