merged in changes from 0.25