Appfog-ready version