current dev branch
progress commit
add docs
Merge pull request #2 from pelias/dev

merge development branch