Merge tag '1.2.1' into develop

Fix from @kcjpop
Merge branch 'master' into develop
Removed unnecessary tertiary operators, deal with chunks, fixed tests
1.2.2