I just added this functionality and created a separate pull request.  Once that goes through, I"ll merge the code here and update accordingly.