Fabric updates
Merge pull request #26 from jayfo/fabric

Fabric updates