mwinn2

@sawenzel : could you merge this PR please? I am developping improvements on top of this branch and I would like to do my PR soon as well.