Merge pull request #76 from Damianofds/master

update scripts and other small fixes