Bumped version to 0.2.0 for release.
Merge branch 'master' into gsoc13