Version 0.3.7

Change-Id: I4213dfef4989a37940f11fe3064ffd20badd766f