MAKIO135 Merge pull request #10 from PlaidDroid/master