Merge commit 'v0.1.2'