Fix duplication, moved my email later, closes #1 and #2