Fix #54 - Changed functions that needed API level bigger than 8.