Hi Tony, I will repost this pull request, updating the branches with Felipe's patch, and with a modification to the DSS fixes. So please don't pull this one yet. thanks - Paul