basic final version
Merge pull request #2 from sudhanshuptl/master

basic final version