Going to finish

and now is over
Merge pull request #2 from jaikrish/master

Going to finish #1