renaming context to options
Merge pull request #1 from reinpk/master

A few typos and renaming context to options.