Version 1.3.8 and fixes #25 #31