Replace insert with upsert to avoid repeated records
Merge branch 'develop' of https://github.com/eeshi/Workers into develop