Made all the changes into one commit that could be a patch for master
Merge pull request #222 from sej7278/1.5

Start of 1.5 development