Merge latest changes from WizCorp for Android
Try develop branch