Merge pull request #15 from 30x/oss

G OSS policy prep2