renamed functions
Merge branch 'master' of https://github.com/rasbt/tutorials_cheatsheets