SA1000 keyword handling

Fixes #188 
Fixes #189