fix #65
Merge branch 'master' into ios