Merge branch 'develop'
Merge branch 'develop' v1.11
setup changed to 1.11 for pypi.org
Merge branch 'master' into develop
point light option added