Merge branch 'develop'
0.4.6

upgrate .gitignore