Remove unnecessary onDisable method & clean up line endings
Merge remote-tracking branch 'origin/master'