Various additions
Merge pull request #11 from sairamsankaran/v10

Various additions