refs #165 merged development branch into integration