Merge pull request #2 from CyanogenMod-X/master

Updated