Merge pull request #2 from collective/gsoc2014

Gsoc2014
Merge pull request #3 from collective/gsoc2014

Gsoc2014