Merge branch 'dev'
hot fix for limit bug
Merge branch 'master' into dev