Merge pull request #534 from stianst/master

Removed long ids and replaced with composite ids