Use late binding for isCompatible.
Small tweaks.
Merge branch 'origin/master'