start moving to Ellen
add ellen support
Merge pull request #1 from fanzeyi/master

refactor