Feature/software maintenance additions Working on #232