Version 0.2.0, Version 0.3.0
Merge pull request #6582 from reygonzales/master

Version 0.2.0, Version 0.3.0