Merged few files from alt-master
Integrated in package