show/hide logic fix
Merge remote-tracking branch 'origin/master'
cleanup