Fixes and addition for stampsy android implementation