add autocomplete
resolve conflict
update
Merge pull request #5 from grigerny/staging

Staging