Code clean-up
Add metadata, clean-up code
Merge branch 'master' into gh-pages