[MAINTENANCE] Merge dev-0.1.0 and master