merge develop (0.4) to master