Remove deprecated comment style, fixes #73
Merge remote-tracking branch 'upstream/master'