James 3.5

James 3.5 is out and about. Merging with the master branch :)