Pull into development repo

Compilation and bug fixes, improved histo performance