Core PR #60 : Bugfix: support for more than 10 contexts