added license, better shell commands
Merge branch 'master' into Make