merges develop and bumps to 1.0.8