Added a bunch of stuff ;)
Removed some console logs and set debug to false
Merge pull request #4 from scoult/master

General update with a few changes