Remove Option<> around bound buffers variables
Merge pull request #120 from tomaka/change-context-bindings

Remove Option<> around bound buffers variables