* Added licence header
* Fixed context bug