updated api and editor
Merge pull request #14 from marqh/apiEd

updated api and editor