Merge pull request #25 from pedroigor/master

Changed to use PicketLink Extensions.