Improve code style
Add archiving feature
Add archiving feature
Fix merge conflict
Update README
Increment minor version number