Merge pull request #28 from craigspaeth/master

Use error emit instead of callback