merge from pastew:master