Closes #106 : Improve Facebook and Twitter integration