Merge https://github.com/elitalobo/GSOC2014

latest commit 73d9d52aec
@elitalobo authored