Duplicated id fixed
Merged with master