merge master with testing code