Merging last second changes from 1.0.2 release