Merge branch 'develop'
Update .gitignore
Fix distutils distribution