Small changes + updated maintainer