First Commit
Merge https://github.com/samsungcruiser/iyop