Merge pull request #4 from SuperDIRAC/master

sync
Merge pull request #5 from SuperDIRAC/integration

Merge pull request #4 from SuperDIRAC/master