Fixed package and documentation