Goodbye Aaron Swartz
Fixed some stuff
Merge pull request #16 from C1D/master

Goodbye Aaron Swartz