Some more fixes
Merge pull request #16 from Agis-/patch-1

Some more fixes