Merge pull request #382 from annando/1603-fromgplus-keywords