Modifications to package master branch