Resolves #8
Resolves #9
Update README