Adding federation support
Merge pull request #55 from nimbus-cloud/master

Adding federation support