Fixed conflicted merge.
Merge pull request #4 from mcollina/custom-id2

Fixed conflicted merge