Fixed slug to be unique
Merge remote-tracking branch 'origin/master'