Fixed bug: IDs not unique (closes #7)