Merged all changes from Munim's branch into master, updated package name to com.pestopasta.cluzcs160