Finish 1.0a1
Merge branch 'develop'
Add missing shebang lines
Merge branch 'master'