Basic update from 3.0 to 4.6

Options and setting differences not yet explored.
Merge pull request #5 from NodePrime/update_4.6

Basic update from 3.0 to 4.6