Merge dev (0.1.3)