Minor updates, License

Signed-off-by: Joseph <joseph@idealist.org>
Merge branch 'master' into gh-pages