took out require statement
Merge remote-tracking branch 'upstream/master'
fix upstream merge
updated for better error handling and more modularity
Updated readme for new changes
Merge pull request #18 from FreekingDean/master

took out require statement