fixed tabs/spaces
Merge branch 'FixesAndAdditionForStampsyAndroidImplementation' into fix_reverted_pull_request_2