merge fix

merge fix
Merge branch 'master' of https://github.com/xprimus/eden