fixed disable not working
Merge remote-tracking branch 'oti/Version02' into Version02