Version 0.3.0.
Merge remote-tracking branch 'upstream/master'