Move development away from main branch into develop branch.

Move development away from main branch into develop branch. #359