Merge pull request #9 from 30x/oss

G OSS policy prep2