Merge pull request #13 from Batov/CodeBoxView

CodeBox View fix
markers
contexts