merge develop -> master for 0.1.0