Merge dev 0.1.2