Version 3.0.x ready

This commit include all modifications for version 3.0.x