Merge pull request #320 from pedroigor/master

[PLINK-478] - Extensions refactoring.