merging #157 fix from master