added updated_at timestamp
Merged with master