Starting to address issue 2
modifying cfg-parser so that it can handle the null stream of tokens