Merge pull request #401 from yggie/fixes

various fixes
fix for deployment bug