fixed comments

Change-Id: I41b58fcf667a451003f836fcf320c52c5481b0f5
Increment version nr

Change-Id: Ifdf5da3ea1e7f12a7bb7702e2ddda4c607aac7a1
Merge "fixed comments"