Merge dev (0.1)