Merge pull request #25 from 30x/oss

G OSS policy prep