Merge pull request #142 from bithin/gsoc2012