Merge branch 'dev'
Changelog updated
incrementing version to 1.3.3
Merge branch 'master' into dev