Fix #33 and fix #38
Fix ios6 delta
Merge branch 'fix/issue#33#38' into develop