Proper versioning

Change-Id: I2054839ca8acb5e1d17524c8691530993748bf8c