merge develop into 0.1-stable