add more useful includes and functions
Merge pull request #1 from vas-and-tor/master

add more useful includes and functions