1.0.2 dev

merging upstream