merged master with #258