close #81
Merge branch 'master' into android