included new features (see README)