merge dev 0.3.1