Several new features + bug fixes (See README.md)