Merge pull request #78 from lespea/master

disableAll must be computed when needed
Merge remote-tracking branch 'upstream/master'