#7 unittests
#7 Dynamic context select size
Merge branch 'context_select_size' into dev