Fix #38 Only pick the value from the first version
Merge remote-tracking branch 'origin/develop' into develop