3.0 release

Merging in master to create release