Added Defacto & fixes #2