Fixes for deployements
Merge pull request #33 from moabidi/hotfixes/deploy

Fixes for deployements