merge changes from pull/179