updated to use straight gem and command line version
fixed merge conflicts