WIP
Merge from master
Remove lodash and refactor library.
Rebuild test suite
Merge pull request #9 from thisandagain/refactor

Refactor