Merge pull request #1 from Joshndroid/master

pull into cm-11.0 branch