toggle objects start
Merge branch 'master' into toggle
toggle objects (fix #40)