Issue/139

Updated PR for #139