Prevent out of range crashes
Cleaned dead code
For efficiency's sake
Release 0.1.7