Added useful features, fixed routes
Merge pull request #2 from adam-weber/issue_2

Wow. Lot's of stuff