resampler functionality added
 fixed merge issues
 adsf