Prepping for release
Adding tests
Updating README
Merging master