Gh383 configure branch

#383 
use return directly