Misc correction
Merge remote-tracking branch 'github/0.0.2-SNAPSHOT' into 0.0.2-SNAPSHOT