Updated to match options JSON structure
Merge pull request #1 from deanriverson/master

Updated to match options JSON structure