Added new constructor that takes in context
Merge pull request #97 from sarality/test

Added new constructor that takes in context