upped max takes to 20
Merge branch 'master' into v1