Various fixes + Twitter link
Merge pull request #1 from aaronraimist/patch-1

Various fixes + Twitter link