make build sript
updated gitignore
Merge branch 'master' into master-experimental