Random updates to version 2.0
Merge pull request #1583 from Cinderella-Man/2.0.0-random-fixes

2.0.0 fully compiled and running