Merge pull request #139 from he116ra1n/gsoc2012