removed extra context, work with reserved keywords
Merge pull request #6 from philippeowagner/master

removed extra context, work with reserved keywords