fix #290
Merge branch 'git' into develop