Updating to latest version
See my private repo for changes ;)

Change-Id: I0288a1140d2dad16996123f60d5151b5bd4ad760