version 3.0 release, merge from develop