Bump to edge
Merge pull request #2 from joneslee85/update

Bump to edge lotus and refactor the mapping