Merge branch 'master' into develop
prepare for new version on 'develop' branch
improve gitignore
testing on issue 317
trial fix for issue 318
doc bugfix
Merge branch 'develop'