put old context back
fix import error
add missing function
Merge pull request #277 from squirrelo/fix-context

Put old context back