stve Merge pull request #9 from aashrai/patch-1