Fixes #245
Fixes #240
Fixes #222
Fixes #222
Fixes #203
Fixes #203
Fixes #193
Merge pull request #246 from mtoma/fix-issue-245

Fixes #245
Merge pull request #247 from mtoma/fix-issue-240

Fixes #240
Merge pull request #248 from mtoma/fix-issue-222

Fix issue 222
Merge pull request #249 from mtoma/fix-issue-203

Fix issue 203
Merge pull request #250 from mtoma/fix-issue-193

Fixes #193