Remove uneeded imports

So that code can be ran without having to install numpy
Clean up comments
Fix crash bug, Clean documentation
Merge pull request #1 from ryanmp/master

Merge upstream changes