I think I've got it working. There were a few issues that didn't show up in versions earlier than 3.5.0... It wasn't difficult just a bit of fiddling here and there (
pry gem to the rescue).
I will send you the pull request with the list of changes later today (I'm in PST time zone).
Hope that wil save you some time and frustration