Made some changes in the fork

Please review the changes and merge to your master of your repo...