Closes #228
Merge branch 'master' into dev
Release 3.0.0