refs #18 merged development branch into integration