Cleans up creating the context
Updates to latest Arcavias core
Merge pull request #84 from nsendetzky/master

Updates to latest Arcavias core and cleans up creating the context