fix for internal server error
Merge pull request #176 from yggie/develop

quick fix for internal server error
Merge pull request #177 from AgileVentures/develop

Deploying fix to Staging