Third Commit
Added Support for api level > 5
Added support for android api level 5