Revert "Merge pull request #2 from stampsy/FixesAndAdditionForStampsyAndroidImplementation"

The pull request is not ready to be merged yet.

This reverts commit 55dd13fcfa2c28d3565386fc2a36741b086b6411, reversing
changes made to feb502aa09046d4b327a2aa99e36ff98feab7bef.
Merge pull request #3 from stampsy/revert_pull_request_2

Revert Pull Request #2