Proper fixKeywords() implementation.
Merge branch 'master' of github.com:mrmonday/j2d