Add g-s 3.13, 3.14 support

Closes #30
Merge remote-tracking branch 'upstream/master'