Consolidated options building to per-rendering
Merge pull request #11 from johncarl81/AJI013

Consolidated options building to per-rendering