Allow custom id's, fixes #24