Add composite support
Merge pull request #4 from oferrigni/composite_support

Add composite support

Another patch courtesy of oferringi