Refactored internals, updated readme for consistency
2.1.0
3.0.0