updating from xalbo and gleki

updating to xalbo's latest version + some sentences from IRC chat
Merge pull request #1 from lagleki/patch-1

updating from xalbo and gleki