Merge branch 'v0.1.3'. (MANY CONFLICT !)
Merge branch 'v0.1.3'.