Small updates and tweaks
Merged live changes and resolved conflicts
Merge pull request #3 from anthonydillon/master

Small updates and tweaks 
I've merged the file