Merge "Adding hippie-oss to example files"