incrementing version and making jeff output method public
resolved merge conflict in package.json