basic features working, tests complete
Merge pull request #3 from mangalaman93/master

basic features working, tests complete