Working on edge version
Merge pull request #1 from zamith/master

Working on edge version