adding updated files
v2
this is the working on rohan update. still need to add the throw exceptions
Merge pull request #33 from candaya/master

Show me the money!