fix add generator
fix some bugs
Basic support for calibration; removed old API; some optimization
version 2.0.0