More udpates to headers. Compilation tested to pass. unit tests pass.
Merge pull request #79 from deepadhurka/dev

More udpates to headers. Compilation tested to pass. unit tests pass.