resolve conflict
build passing
Merge pull request #27 from ppibburr/master

reflect latest mruby API changes