option fix
Merge branch 'roundproceeds' into testing