fixing some issues
Merge pull request #15 from Boned-777/scr

fixing some issues