issue work
Merge branch 'master' of https://github.com/project-douglas/eris