moved #167 to master