Merge branch 'master' into develop
Added col_disabled option
Merge branch 'release-0.2.1' into develop
Merge branch 'develop'