Merge development with master

Merge development's (3.0.2) branch with master's (3.0.1) branch