everything works
fixed merge conflict
Merge pull request #30 from willtsay/e7chun

everything works