More changes from the deployment branch
Merge pull request #290 from goranche/master

More changes from the deployment branch