fixing issue #8. Still need to add pairing information to response.  Also further work on fixing issue #12