Merging Dev branch into master branch

100 commits over the course of 32 days.  Many many hours of work!!!

:octocat: