ready for merge #157 #160