Finished product (should have committed earlier)
Merged changes from github website