Pull request for #175 #178