Added armv7s support