bug fixes
Merge pull request #4 from GiorgosPa/shit

bug fixes