Merge Version 2.1.5 to Master Branch

After considerable testing and refining of the code, and after a number of bug fixes, version 2.1.5 is believed to be ready to be merged back into the "Master" branch of the project.