Finish Implementation
Merge pull request #1 from AlexNarayanan/master

Finish Implementation