Pull request 2

Code updated to feature's mentioned in README.md . Unit Tests have been added.
Future plans are to add regression tests for views and improve UI