Merge pull request #1 from neworganizing/master

Some updates needed for deployment.