Update the development branch with recent changes

Merging testing branch into the development branch #35, includes the naming changes #96 as discussed #73 and changes to the conf file #51.