Merge pull request #142 from smititelu/master