fix #294
Merge branch 'git' into develop