implemented composite key
Merge branch 'master' into compositekey
Merge pull request #33 from nashtsai/compositekey

Compositekey