Fixed #13: Deployment and staging