Fixes #49
Merge branch 'master' of github.com:averrin/emergent