Enhanced pb & switch to support disabled attribute, fixes #5
Merge branches 'master' and 'issue#5'