bug fixes
Merge pull request #9 from GiorgosPa/shit

bug fixes