Paul

Thanks for getting these fixes in so quickly! It may be easier if you implemented those changes as I am not sure which branch to fork :), here are all...

@harm-less any thoughts on when this may make it into a release? Thanks!