Merge pull request #1 from hodorcage/master

Added some GREAT features
Added super important critical function
important, really important
Merge pull request #2 from potenshia/master

important, really important
added uri func