Cleaned up relative references and improper quoting.
Merge remote-tracking branch 'origin/master'