update
bug fix
3.0 ready for release
Merge branch 'develop'
Merge branch 'master' into github