Immediate changes and bugfixes required while deploying.
Merge branch 'master' of https://github.com/mutt49/snc