Fixing #24 with better solution. Wiping bug solved using CustomScrollView