Merged linkedin/master
Release v0.2.2-pre
Resolved conflicts