Update to previous pull request

I've simpllied the last request; I had changed the external api for new Rivets.Binding, which is generally frowned upon.  The new version only modified internal variables/functions.