Basic implementation
Merge pull request #2 from bvssvni/master

Basic implementation