Merge pull request #81 from teverett/master

Updates to BNF