Fixes
Merge pull request #55 from korczis/feat-paas

Fixes