Merge pull request #140 from chisholm/master

Pull request for issue #133
closes #87.
Merge branch 'master' of https://github.com/OVALProject/Language