Merge pull request #296 from kosmakoff/dev

Fixes for issue #295
Merge pull request #1 from colobot/dev

Merge pull request #296 from kosmakoff/dev