merged elastic-type github project
edits