oss-ready
Merge pull request #2 from pisi79/master

oss-ready