Merge dev (0.1.1)