Add context functionality
Clean up return logic
Merge pull request #33 from exell-christopher/master

Add context support