Also updated documentations. Fixes #304 Change-Id: I5e8e87b005ebfa9dc78d47e2501585b083120f6c
Change-Id: Ia043612012ff3d101afcf3366d95f9001f0dc8f4