some fixes
Merge pull request #191 from Ademarh/FixesSprint10

Fixes sprint10