Merge pull request 2 from joakim-hove/master - Added code to add Keywords to parser class