Merge branch 'development' into master

Updates to 3.0.1