comments can start anywhere. add keywords
Merge remote-tracking branch 'dylanwh/master'

* dylanwh/master:
  comments can start anywhere. add keywords