Context support
Merge pull request #2 from m16a1/master

Context support