merge pull from datasalt/pangool master