X issue94

Fixed issue #94 - Context added.