Merge tag '1.0.2'

fixed view
view fixes